Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into...

Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into tm-d1-dev-plus-aosp am: 34db7cdd

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



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