Fixing app compat issue b/72143978

Revert "Remove obsolete workaround."

This reverts commit 5e48241a95b843c10f96c57d8544af9d04807218.

Bug: 72143978
Bug: 24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test: 3471433 for b/24465209 and apps open
(cherry picked from commit 0c3c4d1c7d6fb210548f32a6e6ec01fd9bf90760)

Change-Id: Ic7989477ea061f4be3335f0af0ce76ba62820b94
1 file changed