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

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

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



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