Merge changes from topic "am-52a8f1e812834d788cd70facb9ea6640" into tm-qpr-dev-plus-aosp am: d9043611d6

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

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