Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into...

Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp am: afa6f208 am: bffa2916 am: 2354bb5b

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

Change-Id: Ife9f5aa34850df5410ed735d2db41bd13c301984