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

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

Change-Id: Ia50a47f5f84ffa92afb04f9f2bc9f325b23a3298