Merge "Skip setting surface start state of non app window" into tm-qpr-dev am: fe4355e71c

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

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