Merge "[automerger skipped] Merge "DO NOT MERGE - Validate notification-channel deletion semantics" into rvc-dev am: dcd3654701 -s ours am: 573a3746ce -s ours" into rvc-qpr-dev-plus-aosp