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

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-dev am: c1aa2bb3 -s ours am: 26068ce8 -s ours am: 4d517b48 -s ours am: b1e88e3d -s ours am: 34cb892a -s ours am: 08f1a5c8 -s ours am: 98921ea2 -s ours am: 83841036 -s ours am: d181990b -s ours am: 6c854406 -s ours am: 4041fa3b -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c2 -s ours am: 3b8290a8 -s ours am: 7d29675e -s ours am: e7ef06df -s ours am: a0dc510a -s ours am: affb156d -s ours am: a2f4bceb -s ours am: c9391002 -s ours am: dabfd4e7 -s ours am: 970e3bcf -s ours am: db4cceed -s ours