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

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

Change-Id: Idc91954ea55c6b7beba067088c654d32e4f0f757