Merge "Merge "Position "At a Glance" on custom clock below status bar." into...
Merge "Merge "Position "At a Glance" on custom clock below status bar." into qt-dev am: b24641b2" into qt-dev-plus-aosp
am: a3c49e2d
Change-Id: I73dcda148ae6b95fe6726c807b2ddbbb499dc01c