Merge changes from topic "am-39e8361d0344470e8d88fd8cfdaa69d2" into udc-qpr-dev-plus-aosp

* changes:
  Merge changes from topic "am-b6b10a616325427088a920b673bff57e" into udc-d1-dev-plus-aosp am: 70050ac5 -s ours
  [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: 7b4b9586 -s ours am: 98f92dd4 -s ours am: 7bdd7c80 -s ours am: 8ef7e76d -s ours am: 3a2711c0 -s ours