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

Change-Id: I49d10d41d5b89c97a2f418ccaed44eeae720bb22