Revert "API review changes Test: make Bug: b/143307441"

Revert "API review comments Test: make Bug: b/143307441"

Revert submission 10738364-CallQualityAPI

Reason for revert: rvc build breakage
Reverted Changes:
I51b4d5699:API review comments Test: make Bug: b/143307441
I53ebc76da:API review changes Test: make Bug: b/143307441

Change-Id: I62b7a516a4c5f3a950906c17700ba13b5906ba6a