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

Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc06 am: 523f18b4 am: c07efa7c

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

Change-Id: Ic4f065f8b5ade69d3bef2f5d5118c8a45c712085