[automerger skipped] Merge "Remove miniresolver header elevation" into...

[automerger skipped] Merge "Remove miniresolver header elevation" into 24D1-dev am: 62f8a057 -s ours

am skip reason: Merged-In Ia047e4b3c39a5991387c64374d2379bcab708b75 with SHA-1 ac92b12e is already in history

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



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