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

Merge changes from topic "presubmit-am-e3b2c7aa82f942259e52399c23d94021" into tm-mainline-prod am: 5bf35db4

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



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