Merge changes from topics "ms34-tm", "ms40-clock" am: a3c2578644

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

Change-Id: I719edc4e4f98b0fdabb50736156551d3f8d35bd1
tree: 0841ef2dc6b13ca6ab4163a6d44ecda6814825f5
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/