Merge "Allow UiMode adb shell command to override night mode custom type. Add...

Merge "Allow UiMode adb shell command to override night mode custom type. Add night mode custom type information in UiMode dumpsys." into tm-dev am: 5128c769

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

Change-Id: I1b36937446242445308200817e4f9e4fb97d188b