Use a better approach to simulate OTAs. am: 97641ac6aa

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

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