Merge "Add Launching with S section" am: 4611a9bf39 am: 7af16a0b38

Original change: https://android-review.googlesource.com/c/platform/cts/+/1468872

Change-Id: Ib6a9dc8b3bc1501376d0eaaf4a8cd1d1ab57bf1a