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

Change-Id: I3471704ee81dc51c59f0798ab8319352d5b521a6