Merge "Fix typo in BaseIWindow.java owners file" am: b2f814064e am: 6d5a079682 am: 063df04968

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

Change-Id: I1531bdbe8f5201b6265709005924aaef09e16b39