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

Change-Id: I3019f9751b69809d3cb66061753f0b76085b235b