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

Change-Id: Id5a9576ab6e37e3744a59d904909d11f668d0e06