Merge "servicemanager: add tests for updatable-via-apex" am: 3e49ad4d am:...

Merge "servicemanager: add tests for updatable-via-apex" am: 3e49ad4d am: b8a0e24c am: 20f5b1d7

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



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