Merge "Fix media showing AOD in split shade and double-line clock disabled"...

Merge "Fix media showing AOD in split shade and double-line clock disabled" into tm-qpr-dev am: 383f8f1f am: 16a569bb am: 02edcdaf am: 50fecc77

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



Change-Id: I4da8ec8c910e3104f29e4098679f64f61425e62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>