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

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

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