Merge changes from topic "am-61de424e00fa4c039dfc661b35221ab1" 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: d21ca322 -s ours am: c0a5820b -s ours am: 88364e84 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea3472 -s ours am: a242d36b -s ours am: c2c6cdd1 -s ours am: aee7da70 -s ours am: d1dee4da -s ours