Merge "Don't show notifications for locked slots" into main am: c2e02586 am:...

Merge "Don't show notifications for locked slots" into main am: c2e02586 am: 7ff75ffe am: e400e294

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>