Merge changes from topics "usc-less-domain", "usc-less-split-flag",...

Merge changes from topics "usc-less-domain", "usc-less-split-flag", "usc-less-ui" into tm-qpr-dev am: 3cd2429e am: 6e543ea6

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



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