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

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