Merge "Do not run NotificationTest on TV." into tm-dev am: d5d0f0c2 am: edcb3175 am: c027289f am: a0a2d4ee

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



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