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

Change-Id: I12af619f1fce710f643387dca3e06c1c4b5258d3