Merge "Update SurfaceFlingerProperties scope" am: 945fa5c957
am: 4d15954900

Change-Id: Ide414d6187f75e6b37b3af15ce219a587792c370