Merge "Fix notifications accepting touches outside their bounds" into tm-dev am: 0a9cb9b4 am: ea8e9ceb

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



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