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

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

Change-Id: Iba93fd361328d85b3e969da08cecdfa302d47d63