Merge "SurfaceFlingerProperties: Use proper prop scope" am: f9e1a4794a am: e667923c15 am: 221885f8b8 am: cdf1982e37

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

Change-Id: I49805b2ef151851959b8eb2d9b4bdd079cd926ef