[automerger skipped] Merge "Run art_boot before odsign." am: fadbbc94 am:...

[automerger skipped] Merge "Run art_boot before odsign." am: fadbbc94 am: 57ecc692 am: 78030e28 -s ours

am skip reason: Merged-In Ib64790dde97faaa6b62ead2c1c8dd53c97f97f9c with SHA-1 7c9c8f52 is already in history

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



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