Merge "Defer ending launcher power mode hint until after transient transition" into udc-dev am: 058c3d61de am: 9856ec7369 am: 163ebb1e9a

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

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