Merge "Fix AppCompat key event handling pre-v11 DO NOT MERGE ANYWHERE" into mnc-ub-dev
am: e8cf5716b0  -s ours

* commit 'e8cf5716b08b577e7173f9f3072494d790adebbd':
  Fix AppCompat key event handling pre-v11 DO NOT MERGE ANYWHERE