Merge "Freeze SurfaceFlingerProperties API" am: 059b153d5f am: e31b16082c am: 0a5ffbf0e1 am: caf864849b am: 92940450f4

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

Change-Id: Id593c38832d18766891d1680ed32f4317788a6a2