This reverts commit 36e81f298f.
Reason for revert: Software Cursor will not be launching in Android U
Test: manual
Change-Id: Ibf70015d294e03aa74d839c0caa64bf3542b341f
This reverts commit 36e81f298f.
Reason for revert: Software Cursor will not be launching in Android U
Test: manual
Change-Id: Ibf70015d294e03aa74d839c0caa64bf3542b341f