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

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

Change-Id: I904b732f6da40df50f74dbffb800a3fccbfdeb73