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

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

Change-Id: I035e22049f3b2c29cddb5ab0b0a7842adc214beb