Merge "API level 30 upgrade: AOSP Contacts" am: 98adb72d18

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

Change-Id: I0d9f2ee895d89a289392b8298fceccc83e4b2110