Merge changes from topics "ms56-historybuilder", "ms65.3" am: 54bc16fc64 am: 7246788b30 am: 8a1007ba5a

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

Change-Id: If1615141e401e464ecfe737e1fff1d92229a17bc