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