Merge "servicemanager: expose updatable-via-apex"