Merge "Fix "No Notification" text not gradually showing on LockScreen" into tm-qpr-dev am: 0162aec6c8

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

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