Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09 am: aa0cee06b1

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

Change-Id: I2cc60fb80d146a2121d0c5cba79e83581f281816