Revert "Android patch: Ticket #11913: Fix bug in temporary workaround."

This reverts commit 65f93a4dc9f38c7ab0da01c680213f679262c986.

Bug: 27855939
(cherry pick from commit 416e28fc84b9f2d3813e2582d82825da7f536eca)

Change-Id: Ib136b873ace390fa25748aef928492516e745704
2 files changed