Merge "Align QS clock to status bar" into rvc-dev am: 525f7756 am: a75f2fcd am: 90c0e369

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

Change-Id: I6455d7070e85a9337c785dbdd4b702ba7b2d20a9