Merge "Make apex_available explicit" am: 2d0281307e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1977809

Change-Id: Ibe707d8b2310f4b67cf7f6d65a4b296ca3ac0ac6