Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into...

Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20 am: 51be6203 am: e4b5e15e

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

Change-Id: Ic5f6708ed5a9d601f79ed80d95301d0d24ed1a45