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: I2a47c4030779112265d957fe58f90136aa0c7831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>