Merge "SurfaceFlinger: Set property in StartPropertySetThread during init am:...
Merge "SurfaceFlinger: Set property in StartPropertySetThread during init am: f9b05eeb am: 36c08c7b" into oc-mr1-dev-plus-aosp am: c2758258
am: 020dc46a
Change-Id: Ic8b26887a98cb97ff27860d142b89dedbdccd348