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

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

Change-Id: I8f727a73716c3f06d8c946a7e014793c5c8046eb
tree: 7ab55c81168967b7c2b5188e839ed1da8cb2704f
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/