Merge changes from topic "am-4dec210676d64ae19c276d5c855b32d7" 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: a4a3f614 -s ours am: fbc04b16 -s ours am: 59f4de32 -s ours am: 39a5a4fc -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: 682110eb -s ours am: a194d55e -s ours am: 85ec73e3 -s ours am: 04d56025 -s ours