Merge changes from topic "presubmit-am-7b3335c9cdef4268997e897a42eba222" into...

Merge changes from topic "presubmit-am-7b3335c9cdef4268997e897a42eba222" into tm-mainline-prod am: e2a9ecd3

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



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