Merge "servicemanager: expose updatable-via-apex" am: 39301eae39 am: 3393a6441a am: 9399840a3a

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

Change-Id: I1c0c8c938a16b73335fcd1ae04f08cc0ee790d0f