Merge "Merge "Fix notifications accepting touches outside their bounds" into...

Merge "Merge "Fix notifications accepting touches outside their bounds" into tm-dev am: 0a9cb9b4 am: 38615a5a am: 4f72de8d" into tm-qpr-dev-plus-aosp am: 91b3a279

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



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