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: 163ebb1e" into udc-qpr-dev-plus-aosp am: aa02f47a

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



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