Merge "DO NOT MERGE ANYWHERE Add new power hints for launch activity am: a2aa3f358f  -s ours am: 145907b2f5  -s ours am: 45d1d74210  -s ours am: 1417c5bb1c  -s ours" into nyc-mr1-dev-plus-aosp