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

Change-Id: Ie15d3c1927f17a36ed6d6bbe4b96c986536be3c7