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

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

Change-Id: I09bc96e8d49a0c49cc29fae905c94f8fda2ed82a