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

[automerger skipped] Merge "DO NOT MERGE Revert "Revert "Clean up debug.sf.ignore_hwc_physical_display_or..."" into tm-qpr-dev am: d6843664 am: 886edd0f -s ours

am skip reason: subject contains skip directive

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



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