Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6e am: 61af3ca0 am: 5cf016c4

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

Change-Id: I6f92b92efabbfab07ab0488c59f188ee3e58ef7c