Merge "Merge "Update the current API dump" into rvc-dev am: 2e152113 am:...
Merge "Merge "Update the current API dump" into rvc-dev am: 2e152113 am: 16c8179f" into rvc-d1-dev-plus-aosp am: 024f16e6 am: 0a2f9517
Change-Id: I51626148f9c2ff30caed26c0e53648b9856e11a1