Merge tag 'android-10.0.0_r31' of https://android.googlesource.com/platform//packages/apps/Contacts into q

Android 10.0.0 release 31

Change-Id: Ia15c18c75c503f4de93845c85cc61f8eef41fba1