Merge "Align QS clock to status bar" into rvc-dev am: 525f7756 am: c9ff47f5 am: f017cf3d

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

Change-Id: I290e398ca94f216f56f97cda47b1d8a203489e7c