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

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

Change-Id: If9dd2a3b57f1c5263e279755ef4a107e8d1ec236