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

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



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