Merge "[automerger skipped] Set apex_available property am: 912db88c1d -s ours am: ca4ca2283f -s ours" into rvc-d1-dev-plus-aosp am: 48aed8d84f -s ours

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

Change-Id: I84502ed058968efc7df771049af0a9a94f2f4bae