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

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

Change-Id: I16a73fde1998efe49f727200d13a981ec0e4364a