Merge "servicemanager: Fix UpdatableViaApex tests" am: 60ff436122 am: a406329ec7 am: d16f3bbb9f am: fdabdd1dab am: 05d8b621db am: f43447cae0

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

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