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

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

Change-Id: I244779c19fab00eede1b7e9f3980679131e75cbb