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

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

Change-Id: I6bdee4835e0331a95f49e3113a0a9855336dc63d