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

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