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