Revert "Remove obsolete workaround."
This reverts commit 5e48241a95.
Bug: 72143978
Bug: 24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test: 3471433 for b/24465209 and apps open
Revert "Remove obsolete workaround."
This reverts commit 5e48241a95.
Bug: 72143978
Bug: 24465209
Test: Tested failing case on sailfish, reverted back all CL's since
Test: 3471433 for b/24465209 and apps open