Use a better approach to simulate APEX updates. am: c33df3b340

Original change: https://android-review.googlesource.com/c/platform/art/+/2477919

Change-Id: I8bb0852364c1c868d478262240c4a623e9e6c0c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>