Merge "AOSP/Contacts - Updated to sdkVersion 29." am: e67c8d6827 am: 3ef453b171
am: 4daf56fd4c

Change-Id: Ie6a4e0aec84e08f964878b8c370da5801b3aefd9