Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 3b6faace6e am: 0e552c0f36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11396513 Change-Id: Ic88558d2acf33b1f3ace4a49c3c85f46ba5c0d58
This commit is contained in: