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