Android N Preview 4 (NPD56N)
Merge "Move sysfs_thermal definition to global policy."