Merge "DSUService: Deduplicate InstallUserdata() and InstallScratch()" am: c2c3a3c7d4

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

Change-Id: Ifd3f768bd8fbda78a8909f0eca01da4fbf609cbf