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

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

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