Merge "Merge "Update the current API dump" into rvc-dev am: 27c43358 am:...
Merge "Merge "Update the current API dump" into rvc-dev am: 27c43358 am: 0f836e75" into rvc-d1-dev-plus-aosp am: 6f67f829
Change-Id: I9555e608d5cf60b0013f49a776ea34f66e95a9a0