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

Android 11.0.0 release 39

Change-Id: If725fbba3c89e1eacb15664c8d3f0d0428a62814