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

Change-Id: I1cde82735cc43082f63e2ae901afb6faeec1c92e