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

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-qpr-dev am: 6ff8b636 -s ours am: 91c3b175 -s ours am: 3029dc01 -s ours am: ed968a1c -s ours am: 324233db -s ours am: 91567e9b -s ours am: 0aaf5cf8 -s ours am: 5e3c754e -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 5bd6bb45 -s ours am: 97b5b9ac -s ours am: 34de4bb4 -s ours am: a1a4bd23 -s ours am: 09e0cded -s ours am: 7b68ff15 -s ours am: 63db4c1b -s ours am: e839b9f7 -s ours