Merge "DSU enhancement (5/N)" am: 0b0060a550

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

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