[automerger skipped] Merge "Switch telephony to use system API proxies" am:...
[automerger skipped] Merge "Switch telephony to use system API proxies" am: 0e285f62 am: bf168324 am: 49cfa37d -s ours
am skip reason: Change-Id I668be5204547a2606dd314cff73bd0e9ccbc72fa with SHA-1 70970132 is in history
Change-Id: Ib50d22fd22d4325e4ec66e3aedf2dc2334280ead