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

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

Change-Id: Ibad37c52bf362fa45a75ca0c84b328c6c378b776