Merge "Merge "Update the current API dump" into rvc-dev am: 40f678fe am:...
Merge "Merge "Update the current API dump" into rvc-dev am: 40f678fe am: d4d65e72" into rvc-d1-dev-plus-aosp am: 8f09dc76 am: 4fd698be
Change-Id: Idc2de3f16074b99d3c41da483907bbdc50040c59