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

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