Merge "Polish splash screen window from large to small activity." into...

Merge "Polish splash screen window from large to small activity." into udc-qpr-dev am: 8e7ccce5 am: 28cdc8c0

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



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