Fix NotificationEntry mismatch crashes when tapping notification. am: 4a206a41 am: 05023573 am: c1eca6ea

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



Change-Id: Ic8bb78c75550cdc93556e7f6a5e69c5e9495cab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>