Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 0533f91da7 am: 140b6479d0 am: 85fba9badb am: e189d40cb7
Change-Id: Ic5a6e8bbd58074432583c73ff7d5bfc8da847f6a
This commit is contained in: