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

Change-Id: I027ab6594b563204515677fca9c256251b7067cd