Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into...

Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e22 am: ed43498d am: 93c90019

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

Change-Id: Ic9d0d4e4da26594c1a6b94907e69bff3cd22c0dc