Merge changes from topic "am-26c28ebb54a241eea293a13ad6ca0543" into udc-qpr-dev-plus-aosp

* changes:
  Merge changes from topic "am-e7b34da0124d4dc98ffbc0896c4c2383" into udc-d1-dev-plus-aosp am: 5eaccd75 -s ours
  [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: b7af8b41 -s ours am: e39b390b -s ours am: 29d509a9 -s ours am: 111592d6 -s ours