Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7
am: b64af9bacd

Change-Id: I261c46544e8e1aef26772d57475037810198e4d9