Merge "Prevent AOD clock from appearing on LS after fold" into tm-qpr-dev am: e9032700 am: fc4b1e9d am: f8a8a3e0 am: 6bcb1fac

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



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