[automerger skipped] Don't show notifications for locked slots am: 1d8f442a...

[automerger skipped] Don't show notifications for locked slots am: 1d8f442a -s ours am: 59a86a6a -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: I7d7ea11c0a292af9a13b95c827f2ae974bb007a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>