Merge "Re-add return statements accidentally removed in aosp/2461534" am: 805a89bf

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



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