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

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b15 am: c731ba07 -s ours am: a3c97f99 -s ours am: 0778a4ee -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 8c2d2c6f am: b68fc241 -s ours am: 67f3e8b1 -s ours am: 28b8ce10 -s ours