Merge "Merge "Remove invalid window flag" into rvc-dev am: e30c1fe9 am:...

Merge "Merge "Remove invalid window flag" into rvc-dev am: e30c1fe9 am: 526a34e9" into rvc-d1-dev-plus-aosp am: 10bc9583 am: d498c318

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

Change-Id: I18c866ac96708dc3f10f5b90ccaacc3e9dccd53e