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

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

Change-Id: Iae71dac171fb675dfdcddbde47f0cd9ef34a9c86