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

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

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