Merge "servicemanager: add tests for updatable-via-apex"