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

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

Change-Id: I63229b471d00a2e96008873d38a80b32e18ee2b7