Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb
am: 1d84f619bf

Change-Id: Ic189edc98c3079ca98b258d08a5821b9c97dc027