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