Merge "SurfaceFlingerProperties: Use proper prop scope" am: 0ea24d2fcd am: 9336d69248 am: 86abb7436e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1421632

Change-Id: Ie53653a3cc970052f161eb0e0d109300c6415acc