Merge "Merge "Return error in "sm unmount-app-data-dirs" if app data isolation is not enabled" am: 4d53e3b9 am: 361fd378 am: 2830048b"