Merge "Don't show notifications for locked slots" into main am: c2e0258630 am: 7ff75ffea0 am: e400e294d4

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

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