Merge changes from topic "am-e25d7396226c447296ddfe8972c5c62f" into udc-qpr-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: 693a6c22 -s ours am: 7718d7a5 -s ours am: 73d0008b -s ours am: 3adc7b7c -s ours am: b939dada -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: 742b9092 -s ours am: 351994fa -s ours am: ad469252 -s ours am: c9d753ff -s ours am: ba391164 -s ours