Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into...

Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac8 am: 397b66c9 am: 863e1394

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

Change-Id: I6585df5d64cab60d7e2a25c0313ff61a222096f8