Merge "Add constants kDsuScratch and kDsuUserdata" am: 053df534d7 am: b465fe24cd

Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1469542

Change-Id: Icbece4cf356634d825a7dc8ccb5ab24f6264f8f8