Merge "Add phone numbers to NotificationRecord from a cached contacts lookup"...

Merge "Add phone numbers to NotificationRecord from a cached contacts lookup" into tm-qpr-dev am: 0ced40a4

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



Change-Id: Ia1be85aff01bff9f6560fc0c074261db1e8558bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>