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

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



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