Merge "Stop using deprecated function AServiceManager_getService()" into main am: 9d6a3dcca9

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3312779

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