Merge "Fix crash in NotificationManager when WP is off" into sc-dev am: 5b858bc0 am: cccb1e9b am: 76aaa91a

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

Change-Id: Ib38fea06aed84d23d10b2bc40a1785b3a8304c45