Merge "Vendor: Omni: Allow custom keys" into android-8.1