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

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

Change-Id: Idfb2128ad2d0dade3ac589c540483e19fcfaba47