Merge "Resolve change in getService return type" into main am: 219b26d32e am: af939e9ed5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3383874

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