Merge UP1A.231005.007 am: bb6c38cee3 am: 6abc82fcda

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

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