Merge "Revert^2 "Remove ART APEX from the bootstrap apexes"" am: 2069f0e32f

Original change: https://android-review.googlesource.com/c/platform/system/apex/+/1581186

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49b5778c20ad03c26113793c60785f0530170282