Merge "System API proxies for the telephony module" am: 48564ac144 am: 9c7c247d3d

Change-Id: I3b5f389b42ed8267ceb4f68bf9867eb18dec8055