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

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into udc-dev am: d990e73b -s ours am: 556dd4c7 -s ours am: 952acb2f -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 1c3d701c -s ours am: a195e6d7 -s ours am: 9c478742 -s ours