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

Change-Id: I5b5e195d368d4dc92a34702a1bacfdc6729a503e