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

Change-Id: Ib0094668b58ea3a8c4b360d8cb427a2dc54b6b33