Merge "Revert "DisplayCutout: Add back always resource"" into pi-dev
am: 665a6b2109

Change-Id: Ib372311e98fc58c6acd3a4ad43c30b23217162da