Merge "servicemanager: Fix UpdatableViaApex tests" am: 60ff436122 am: a406329ec7 am: d16f3bbb9f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2579395

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