Merge changes from topic "presubmit-am-86edc02cc89b443ca1d69b5d4139164f" into...

Merge changes from topic "presubmit-am-86edc02cc89b443ca1d69b5d4139164f" into tm-mainline-prod am: 2cee15a6

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



Change-Id: I46d0813fc81513f4df9d59a3eb46dfef26d6d7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>