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

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



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