Merge "Sets up LifecycleOwner for shade." into tm-qpr-dev am: cce53f3c am: 11692ac2

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



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