[automerger skipped] Merge "Remove redunant aidl api" into rvc-dev am:...
[automerger skipped] Merge "Remove redunant aidl api" into rvc-dev am: e6ca1baa am: d29fac3a -s ours
am skip reason: Change-Id I3de4196c6fe8ecfae4a6bd5f6bac7920695150c8 with SHA-1 6eb3709c is in history
Change-Id: I7d7ac842e70c670ddb4cd7b7ac491f2e217f8eae