Revert "Re-revert Android patch: Ticket #11913 changes."

This reverts commit bb572b8d9c31eac94db1a8e5de69e6fbbcab6de8.

Bug: 27855939

(cherry picked from commit 7c0783a71eb39182b02e60d1a027252a502125e6)

Change-Id: I8eb5846add5f52a11023267c13cd25377486ff30
2 files changed