Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4
am: d8ab97081b
am: 5a67cd9bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15101190 Change-Id: I526cffc4addd24ec355f5c087befb95682d2ef3c
This commit is contained in: