Merge "Merge "Return error in "sm unmount-app-data-dirs" if app data isolation is not enabled" am: 4d53e3b9bc am: 361fd37803 am: 2830048b80"