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

Change-Id: I6ffa3183f66121df9004880aa46e81f336ddfeae