Merge "servicemanager: add tests for updatable-via-apex" am: 3e49ad4d13 am: b8a0e24cfb

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

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