Merge "servicemanager: expose updatable-via-apex" am: 39301eae am:...

Merge "servicemanager: expose updatable-via-apex" am: 39301eae am: 3393a644 am: 9399840a am: 23d1df46

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

Change-Id: I01f936fb94b793a2908e3a83ba5a8345cd73c1f0