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: f6743c03 am: 9e578ed3 am: 65ff3763

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



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