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

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

Change-Id: I0ab174eceba56bf023a18e1cb420ce47877edc0a