Merge "Update SurfaceFlingerProperties scope"
am: 945fa5c957

Change-Id: I5223ee4a53b15abe13d62c6020bde4f275015e9c