[automerger skipped] Merge "Reland "Set apex_available property"" into rvc-dev am: 83fda04e5a -s ours am: e3c8bc5d11 -s ours

am skip reason: Change-Id I022ce8459039c11f62d7f7f4e6e1a822489da953 with SHA-1 67a0b305ab is in history

Change-Id: I38d7d3cd46af53ca63cc4773d5f6ed9804f71c9b