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

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-qpr1-dev am: 2028c143 -s ours am: 34cc50a4 -s ours am: 4876714b -s ours am: 53c0fc53 -s ours am: 1902369c -s ours am: 2a21ae46 -s ours am: f733e41b -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 976fd54a -s ours am: 4306517b -s ours am: 6b6765b1 -s ours am: 00bf4456 -s ours am: 8f0a0f76 -s ours am: a2afe552 -s ours am: 8bc1504d -s ours