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

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

Change-Id: I351006552864a7ceeccbbb71fff16f90b7555ae6