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

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



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