fix sensors struct

Change-Id: I12bbefc83ef2eb2bd0db78a688de2860b517ef01
Remove extra framework res entries

Change-Id: I6021a541334248f80026abb0b3364ccf2c8dd235

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml