Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-mainline-prod am: 35b574b466

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

Change-Id: I8bdc5821af338d6bc9b7defa4dcb74bdaada1ec3