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

Merge changes from topic "presubmit-am-c45b2d983b9d4ec78289228420413054" into sc-v2-dev-plus-aosp am: c54ae543

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

Change-Id: Idd2e71889fec6d33d1e354a16e6fa427c98dc7f4