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

Merge "Re-add return statements accidentally removed in aosp/2461534" am: 805a89bf am: 323faab5 am: 50d753f7 am: 48540838 am: 3e0ca7eb

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



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