Revert "Add API to allow apps more control over instantiation"

This reverts commit 6945710e124ae22dac90f53e9183ab67c6eab258.

Bug: 64345190
Test: n/a
Change-Id: Id0aa0f3c9fca64476d163ea8b42a74182050b3ae
5 files changed