[automerger skipped] Merge "Don't show notifications for locked slots" into...

[automerger skipped] Merge "Don't show notifications for locked slots" into udc-qpr-dev am: bce0c43c -s ours am: f1a774c9 -s ours

am skip reason: Merged-In I01de2fd2d5942dd4e5e462b46890ce1f10800768 with SHA-1 f5f9dd3a is already in history

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



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