[automerger skipped] DO NOT MERGE Revert "Revert "Clean up...

[automerger skipped] DO NOT MERGE Revert "Revert "Clean up debug.sf.ignore_hwc_physical_display_or..." am: bb7cabfd am: d594d748 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Icb86d5202a7b38ae881e69ec7fdf08c5979d1b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>