DO NOT MERGE ANYWHERE Add new power hints for launch activity am: a2aa3f358f  -s ours am: 145907b2f5  -s ours
am: 45d1d74210  -s ours

Change-Id: I4689365f8c48e94160bc6c74ab1ff86a6f81e8c4