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

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: I9c42dd1cb6d2db3d081342e29c734d8acbc18c86