Merge "Merge "Clarify reasons for notification removal." into udc-dev am: ebf1af85 am: 88f7b059" into udc-d1-dev-plus-aosp am: b6e8a162 am: 6aa3aaf4

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



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