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

Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20 am: 0522bb8e

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

Change-Id: Ic4f6585b012b3331669ff3e4cc5186c6ef17b8df