Merge "Merge "Update the current API dump" into rvc-dev am: 55632d32 am:...
Merge "Merge "Update the current API dump" into rvc-dev am: 55632d32 am: 6cfbf2f2" into rvc-d1-dev-plus-aosp am: 9fd083de
Change-Id: Ie22b65f6afaf03550f4018e6d25827ebc9874744