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

This reverts commit 65f93a4dc9f38c7ab0da01c680213f679262c986.

Bug: 27855939
Change-Id: I4f9adf929ea43a00a0c20b412badd565398f70fb
2 files changed