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: I892e85a9096a3382642e97c9da37cf951f348b98