Merge "Hide Note Task if triggered twice from the lock screen" into udc-dev am: 8f9a754e

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



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