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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifaa4e39c5fe7632a78a59266ff90ce13a4070e17