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 am: 99f65f0d

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



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