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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibca0f1cb06a9468c8f24911666432cac17822ec6