Merge \"Add launch power hint for activity launch end\" into nyc-mr1-dev
am: a4e2bf4712

Change-Id: I755ba7d10d18e2b302efdc3a8f28ec16cdd969e9