Merge "Hide Note Task if triggered twice from the lock screen" into udc-dev...

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

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



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