[automerger skipped] Merge "Add flag to disable .art file madvise by default"...

[automerger skipped] Merge "Add flag to disable .art file madvise by default" into main am: 9b20ff48 am: 681ea630 -s ours

am skip reason: Merged-In I29adf8e35a07b3f807e41bb5aa0bf6c337cc02b7 with SHA-1 83dfa102 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3466175



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