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

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



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