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

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



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