[automerger skipped] Converting message.obj to AsyncResult to deliver context am: 9e370cfdd1 -s ours

am skip reason: Merged-In I29598ecdc7ff0504349d58e54d9194de6ace730b with SHA-1 cdd81e1058 is already in history

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

Change-Id: I26095e501bf497910e293e704c1d6e199518975b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>