Merge "Fix NPE in NotificationRemoteInputManager logging" into rvc-dev am: cc40644676

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

Change-Id: I0c030e4248c670c6abb4c30d1e2896db43ac0894