Merge "Make sendMessage ListenableFuture" am: 2fe5ea0499 am: f3746d26b0

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

Change-Id: I8eab5edc8fabba9f894fe65c6f897a7cad256c70