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

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



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