Merge "Ensure the splash screen launched from system ui must be solid color."...

Merge "Ensure the splash screen launched from system ui must be solid color." into tm-dev am: 02e7e439 am: 275a5baa

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



Change-Id: Iff220a8274d9b2c83c2810c28eb0bdb2791a933a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>