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

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