Merge tag 'android-11.0.0_r39' of https://android.googlesource.com/platform/packages/apps/Contacts into r

Android 11.0.0 release 39