[automerger skipped] Merge "Revert "Set apex_available property"" into rvc-dev am: 01da4e7850 -s ours

am skip reason: Change-Id I076c412607a0d3f2374422baf0cc52216005da44 with SHA-1 aaf6845952 is in history

Change-Id: I7fe3795c3648c346171c023466b2344a6aefac55