Merge "Reland "Revert "Make KEY_DSU_SLOT work""" am: baebef61 am: 64239194 am: 46c1d8c7

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



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