Revert "Merge "Removes instant apps from certain screens" into oc-dev am: 1c956b304a"

This reverts commit d7da58ade5eebc2ec664abb0afc7a8cd5e79b75d, reversing
changes made to 6d539dc7a474586a8c2ebfbc56284925e1e37a70.

Bad automerge of an already-present patch caused a duplicate definition
of LIST_TYPES_WITH_INSTANT.

Test: none
Change-Id: I98e74d1c0db739dd425c945652251a1050d26c63
1 file changed