Merge "Revert "Eliminate delay before contacts lookup for a Notification""...

Merge "Revert "Eliminate delay before contacts lookup for a Notification"" into udc-dev am: 58197e43

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



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