Fixing app compat issue b/72143978

This is a squash revert of a4a48545 and 1b0f2b49

  Revert "Remove a test for backwards compatibility we no longer support."

  This reverts commit a4a48545.

  # This is the commit message #2:

  Revert "Remove obsolete workaround."

  This reverts commit 1b0f2b49.

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 b6310c2a)

Change-Id: I5b22776b4aa795ca5e76acde4d4fc1da4c2e8571