Merge "[automerger skipped] Merge "Add mock modem service operations in Telephony" am: a7ab25609e am: 2daf9fed80 am: f7d2720095 am: 328e430b67 -s ours"