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

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

Change-Id: Icb6afd203bcea6139f0cf1f48cb064c3b0847869