frameworks: base: fix merge
Signed-off-by: Luis Cruz <ljc2491@gmail.com>

Change-Id: I6f34e719d279402a2c8ba9b4a4529342b2b9dc7b
fix merge
commit 56adcbd92118ff73ff5380ed1968f2870a18a362

Change-Id: I7af98e98ed531512591024b0827377649b62f687

input: Add workaround for broken hardware keyboard support

* Add workaround var for devices with broken kernels

Change-Id: Ib6ade70f399067469ba5aece48c6ec4608125d75

Conflicts:
	core/res/res/values/config.xml

Conflicts:

	core/res/res/values/config.xml
	core/res/res/values/public.xml
	services/java/com/android/server/wm/WindowManagerService.java