Hardware key custom rebinding (3/3)

Change-Id: I9afbfabfe59a2b77443642d9e35678550612d98a
Merge "Hardware key custom rebinding (3/3)" into lollipop