Keyhandler: AOSPA related changes