Merge "Loading boost: use the existing GAME_LOADING power mode, and deactivate...

Merge "Loading boost: use the existing GAME_LOADING power mode, and deactivate it on a timer." into tm-dev am: 70853212 am: 61a0ab57

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



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