Merge "Revert "Make Notification long clickable"" into tm-qpr-dev am: 324457d5 am: f892dca9

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



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