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

Merge "[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61 am: 839ce544 am: 84bafc9f am: d6353487 am: 6d5ea9e8 am: 8da96d69 -s ours am: aa31e245 -s ours am: a2b94bec -s ours am: 0a5f6297 -s ours" into tm-d1-dev-plus-aosp am: 00d1058c -s ours

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

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



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