Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac8 am: 61e7977a

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

Change-Id: Ief847629af5c6cddcdc6ce0e9d8ccb678651243e