[automerger skipped] Merge "Extract app label from component name in...

[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev am: 14a63dbf -s ours am: ff7f705e -s ours am: 23cae804 -s ours

am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff341956 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647



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