jf: bring back support for samsung HDR.

Change-Id: I04328085a75bfee76adead347982567f8c20058f

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