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

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

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



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