[automerger skipped] Merge "Separate results and exceptions for modem activity" am: 52912f3b09 -s ours am: 00eec1f330 -s ours am: ead071f91f -s ours

am skip reason: Merged-In Ibb8d20a4318f06d0acbc072b83c0a51c1fd8209d with SHA-1 d0f208ccc9 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1820130

Change-Id: I3a08101ac295ed31f05b9cf51d810e3174fd84af