[automerger skipped] Merge "Add apex_available field in...
[automerger skipped] Merge "Add apex_available field in networkstack-aidl-interfaces" am: 665d47a7 am: e5d3381d -s ours
am skip reason: Change-Id Ia3c568d5af6c3949f40125193bc8a49b47868128 with SHA-1 49d1392e is in history
Change-Id: I75025b1c02f14fb422891cbdc65b1510b1161558