[automerger skipped] Merge "Add jarjar rules for telephony tests" am:...
[automerger skipped] Merge "Add jarjar rules for telephony tests" am: be212f70 am: c8e3921a -s ours
am skip reason: Change-Id Ia7b80233a2934b285beb4684c3cac2e32521f6d4 with SHA-1 f926c802 is in history
Change-Id: Id9a0afb453f62fd4b462eeee0e8b35a3a515f625