Merge "Merge "Set default for controls as enabled." into rvc-dev am: c6616838c3 am: fcd121cc5c" into rvc-d1-dev-plus-aosp am: 1ae35a61a9 am: f94a4b0d5d
Change-Id: I15be0295c7922972f9a305b237904d1b6b6ea667
This commit is contained in: