[automerger skipped] Merge "System API proxies for the telephony module" am: 48564ac144 am: 9c7c247d3d am: e721ab2502 -s ours
am skip reason: Change-Id I6109aef77171346ecb103c190526b7b9b81012b2 with SHA-1 944aeffa85 is in history

Change-Id: I7959daa3e197ccbaa5ee2a1dca27f73e1f9f1770