Fixing app compat issue b/72143978

Revert "Remove obsolete workaround."

This reverts commit 34714335.

Bug: 72143978
Bug: 24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test: 34714335 for b/24465209 and apps open
Change-Id: Ia124f2216ba724184b73616a29f08fc906daaff4
(cherry picked from commit cca7bd4c)