Merge "Eliminate delay before contacts lookup for a Notification" into udc-dev am: e180d3cf am: a5f5a3c7

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



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