Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3cc8 am: 08c51b04ca am: d312550ff8 am: f23caacaf1

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

Change-Id: I4ecebf6cc2c8c0eb69aa14164a19426947470eb8