Merge "SurfaceFlingerProperties: Use proper prop scope" am: f9e1a4794a

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

Change-Id: Iace4c940b24671316d622b5d8f5d7d19a3355065