Merge "Mark display ready when it loses active child" into tm-qpr-dev am: d4dc599b am: e2c709c1

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



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