Merge "Revert^2 "Introduce Windowless starting window."" into udc-dev am: 0b2aa295 am: 2e086486

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



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