Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 2c29250b44" into nyc-mr2-dev-plus-aosp
am: b5a5a51623

Change-Id: I6ceee43b87307b384cc3b6632b23d3859afa770a