Merge "Bump AOSP Contacts to 1.7.30" into ub-contactsdialer-k-dev
am: 61879daf7f

Change-Id: I97d5430c550af5865c5fff8a4f8c9560f4c5c2a9