Merge "DO NOT MERGE Revert "Revert "Clean up...

Merge "DO NOT MERGE Revert "Revert "Clean up debug.sf.ignore_hwc_physical_display_or..."" into tm-qpr-dev am: d6843664

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



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