Merge "Merge "Controls - Remove support for mock" into rvc-dev am: 1667d235...
Merge "Merge "Controls - Remove support for mock" into rvc-dev am: 1667d235 am: 40b66576" into rvc-d1-dev-plus-aosp am: f8b02d46
Change-Id: I9576c4ce38edaa919d4cd934682101bf176196ba