Merge "[Ongoing Call Chip] Fix NPE if the notification doesn't have a content intent." into sc-dev am: 614e76dc am: 40c733e3 am: 8decadd3

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

Change-Id: Id5ed472f0b337d215bb582fe5ec9793f3703c0fd