Merge "Fix the missing history event problem." into tm-dev am: 25019b37

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



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