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 am: 1d23b292
Change-Id: I6d8bfcbe96c2dce8a1a00220e86a9ba498b7a7a8