[DO NOT MERGE] Preserve FRP lock if wiped during SUW
am: 14bf226c79

* commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW