Merge "Check lock settings status before injecting KEYCODE_MENU" into stage-aosp-tm-ts-dev