Merge changes from topic "am-b6b10a616325427088a920b673bff57e" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-v2-dev am: d57db27a -s ours am: a1797b33 -s ours am: 7b4b9586 -s ours am: 98f92dd4 -s ours am: 7bdd7c80 -s ours am: 8ef7e76d -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea3472 -s ours am: a242d36b -s ours am: 571f185a -s ours am: 177c0705 -s ours am: 7bdf7eb2 -s ours am: fa364fa2 -s ours