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

Merge "Merge "Fix the missing history event problem." into tm-dev am: 25019b37 am: f6743c03" into tm-d1-dev-plus-aosp am: d1a38e2f

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



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