Revert "Merge pull request #19627 from cctuan/987487-2"

This broke the Dialer and Usage app.

This reverts commit d5c9689b19d8871bc8e03d959db4959a90041460, reversing
changes made to a10f4f3f30e7d9e460d2702395bbc09976a42b60.