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

* changes:
  Merge changes from topic "am-24796317a7b64464aafa3658caad4984" into udc-d1-dev-plus-aosp am: 353d9086 -s ours
  [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 am: b7ae0897 -s ours