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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556237

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8deb160530205a3ac3a390ec87a8cc58ceb2b16e