Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into...

Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp am: 6e4fd42d am: 77a97bba

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



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