Merge "Make green SC notifications auto-cancellable." into udc-mainline-prod am: 907539b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/24105270



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