Merge "Merge "Defer ending launcher power mode hint until after transient...

Merge "Merge "Defer ending launcher power mode hint until after transient transition" into udc-dev am: 058c3d61 am: 9856ec73 am: 66c37f1f" into udc-qpr-dev-plus-aosp am: c95ab4b1

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



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