[automerger skipped] Merge "non-mainline telephony related AIDL...
[automerger skipped] Merge "non-mainline telephony related AIDL refactor/decoupling" am: e843fc46 am: 2dbeb00f
am: 34807dc0 -s ours
am skip reason: change_id I89c77ae7f006437e954af0d42491217a9f24b64d with SHA1 dd85b504 is in history
Change-Id: I6df7088e76b95526ee701bd017fe495f5be95001