Merge changes from topic "am-8a1c2556f29f4cbaa6945d3156a205b3" into tm-d1-dev-plus-aosp am: 933f3a97 am: 43163784

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



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