Merge "Reland: Register C2 HAL Service v1.0 for Q and v1.1 for R." into...
Merge "Reland: Register C2 HAL Service v1.0 for Q and v1.1 for R." into rvc-dev am: 81979623 am: 6efa220a am: b665bc6b am: b456a799
Change-Id: I100d660a25f6fb28e8954b6c6b091bb6c79b62e4