[automerger skipped] Merge "Look up phone numbers associated with a...

[automerger skipped] Merge "Look up phone numbers associated with a NotificationRecord's contact URI." into sc-v2-dev am: c69d39d7 am: 478154d5 -s ours am: b29ab1f7 -s ours am: 158151cf -s ours

am skip reason: Merged-In I83cc7fc036a3962d2468557d41b546f40a3cfbcf with SHA-1 fa8fd0d9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17198933

Change-Id: I712cd08ab9f2f20832e3e78fd25b63d226902ad1