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

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-dev am: a3886a3f -s ours am: e8b37815 -s ours am: 0ee52eca -s ours am: 6beebebf -s ours am: b7af8b41 -s ours am: e39b390b -s ours am: c37a833b -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 30d1770d -s ours am: b316efb7 -s ours am: 61bc051b -s ours am: 6b25ef9f -s ours am: c680209d -s ours am: fe28a5d3 -s ours am: ba77b6f1 -s ours