Merge changes from topic "am-e087625a2e9945a5b6101661dbfdcfd4" into udc-qpr-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: c88a534e -s ours am: c84ad52e -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: 625f3293 -s ours am: 73064a13 -s ours