98c91a65cf
This reverts commit a163646c7a.
Reason for revert: Re-submit with ENABLE_ALL_APPS_RV_PREINFLATION and ALL_APPS_GONE_VISIBILITY turned off in child CL (submit together)
Test: Tested in ag/24107285
Change-Id: Ia85c1e8447c45ff44814ad4bfe0f178a72d0e7d3