This reverts commit fb43f54289.
Reason for revert: Software Cursor not launching in Android U
Test: manual
Change-Id: I3f27b7d8958f455a580758192794308d5f91d152
This reverts commit fb43f54289.
Reason for revert: Software Cursor not launching in Android U
Test: manual
Change-Id: I3f27b7d8958f455a580758192794308d5f91d152