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
Change-Id: Ib6c943dc1a52458370b530975a54b268a260b35b