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

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

Change-Id: I4916bfb3b247294c5753e9c2653611ac7272c314