Merge changes from topic "am-24796317a7b64464aafa3658caad4984" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b15 am: 677b43cb -s ours am: 32cd68e6 -s ours am: 201bb40d -s ours am: 7ae72717 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 8c2d2c6f am: 5041574a -s ours am: f7275110 -s ours am: 13cbc11d -s ours am: 173df057 -s ours