Merge "Reland "Revert "Make KEY_DSU_SLOT work""" am: baebef61 am: 64239194...

Merge "Reland "Revert "Make KEY_DSU_SLOT work""" am: baebef61 am: 64239194 am: 46c1d8c7 am: fcf85566 am: 8dfdb580 am: ff82a820

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



Change-Id: Ied0013b0346e7cc10b60c483be0f3155d64faac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>