This reverts commit 3c7272f18e. Reason for revert: Software Cursor not launching in Android U Test: manual Change-Id: I92032755d1eab0b352108b2f2f9814e8d6c9f4a3
3c7272f18e
88bf26bf37