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

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

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