Merge "DSU enhancement (5/N)" am: 0b0060a5 am: 1b1d9c69 am: 9ad07c6d am: c14364dd

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



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