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

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



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