Merge changes from topic "am-28212c0c6de44616b530d551080b64df" into...

Merge changes from topic "am-28212c0c6de44616b530d551080b64df" into tm-d1-dev-plus-aosp am: fc9724a1

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



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