Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8 am: db6bdc35f2 am: 08d23b359d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440

Change-Id: I39a1bc52cfe9007dce910d43f3cd0bf5e150eca5