Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into...

Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb7032 am: 5a00ccef am: b87b6e66

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

Change-Id: I5e3bc48cee42ee88eca211a9f8109d94f44fcdcb