Merge changes from topic "am-cd5a3cea6b294c4983a26f694f5a5c34" 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: 62510b66 -s ours am: 6ca67d66 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 1c3d701c -s ours am: b6fb3107 -s ours am: 82f554b1 -s ours