[automerger skipped] Merge "Inherit source windowing mode in some cases." am: 530fa56bc0 am: 7c30bea5af -s ours am: e55c204242 -s ours

am skip reason: Change-Id Ib1b75145c0b0b38b07bcde2ca66a1d772a2c2d0f with SHA-1 2517de66a9 is in history

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

Change-Id: I1ac1ee5af6187473caaee003561f4f47eb1a108a