Merge "Align QS clock to status bar" into rvc-dev am: 525f775606 am: a75f2fcd70

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

Change-Id: I7dda5b2270954f39d99a37bdaae01d2ad521f670