Merge "AOSP/ContactsTests - update the Contacts test package version to target P (28) or higher." am: 6551ff729f
am: 285a6f345e

Change-Id: I92fea6ce571d907402b7d542fbb588a77a44c7d7