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

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

Change-Id: I8a70cf05eac576a3752511ffe87d907ee1ee7602