This reverts commit 205018a854.
Reason for revert: Software Cursor not launching in Android U
Change-Id: Ieddc6b27a8a28910e7c12328ee6d1b5e0d2e4c17
This reverts commit 205018a854.
Reason for revert: Software Cursor not launching in Android U
Change-Id: Ieddc6b27a8a28910e7c12328ee6d1b5e0d2e4c17