Revert "Merge "Removes instant apps from certain screens" into oc-dev am: 1c956b30"
This reverts commit d7da58ad, reversing
changes made to 6d539dc7.
Bad automerge of an already-present patch caused a duplicate definition
of LIST_TYPES_WITH_INSTANT.
Test: none
Change-Id: I98e74d1c0db739dd425c945652251a1050d26c63