[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421  -s ours
am: 439033dd93

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