Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" into...

Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" into tm-mainline-prod am: 8f16b0cd

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



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