Merge "Device Controls - Supporting activity launch" into sc-qpr1-dev am: b6dfc45c am: f2de3640 am: 9572a0b0

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

Change-Id: I210e67e9900cb3a50607593383ed8e5d6c307287