Merge "Return error in "sm unmount-app-data-dirs" if app data isolation is not enabled"