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

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



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