Merge "servicemanager: more restrictions for isolated app"