Merge "Using LaunchActivity when possible" into sc-v2-dev am: a6a85a9be2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15595469

Change-Id: Ie2010c921063625e3430fc4edf585d0639dd7183