Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d77 am: 1422a607 Change-Id: I2f3bf02f57c5f00964e645321467977b4ef498a7