[automerger skipped] Merge "Exempt TV devices from Notification Permission"...

[automerger skipped] Merge "Exempt TV devices from Notification Permission" into tm-dev am: 3d5fff0b -s ours am: 0abf8a17 -s ours

am skip reason: Merged-In I9aeef86871ab7ca912cc30e1cf4ebd84d7014992 with SHA-1 3a7a73f5 is already in history

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



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