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: 57e3d589" into rvc-d1-dev-plus-aosp am: 293d479a
Change-Id: I92278255db96d3e760a679acad027d324856ad33