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

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

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



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