Merge "Revert "Support keyboard long-press on notifications"" into oc-mr1-dev
am: 77af296764

Change-Id: I7e54e439ec68a5a6d329492d4a3c135528fed5e1