Merge "Device Controls - Supporting activity launch" into sc-qpr1-dev am: b6dfc45ca1

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

Change-Id: Iec0d27cfe0e259e7bde1ed724563d3d8fbab4bd0