Merge "Fix NPE in logActionClick when we were re-fetching the NotificationEntry we already had." into sc-dev am: 293436df am: 20882be0

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

Change-Id: I51ef0c304b175d6e54005d6344e0997636f4b0fd