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