Merge commit '84ec90cbdf950bfa129c30d504f117178c3e3ade' * commit '84ec90cbdf950bfa129c30d504f117178c3e3ade': Fix for 2129239: Always enable the menu hard key in LockScreen when 'ro.monkey' is set.