Merge "Fix AppCompat key event handling pre-v11 DO NOT MERGE ANYWHERE" into mnc-ub-dev