Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8 am: 0b90ee1161 am: 4650df393f

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

Change-Id: Ia652c06bf3986fa9dcc7bdfa3539886393fcb3b2