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: 8c1940ff am: 5550c9d2 am: 3b5564b7 am: 0742ac16
Change-Id: Ie36976700e501d359ac732cb49257506f8a3781c