Merge "AOSP/ContactsTests - update the Contacts test package version to target P (28) or higher."