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

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

Change-Id: I6d622bb6f655d32bc764c7c8ab569de4539707d0