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

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



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