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

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



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