[automerger skipped] Merge "Fix idmap2 compiling against musl" am: 3ba8a37e...

[automerger skipped] Merge "Fix idmap2 compiling against musl" am: 3ba8a37e -s ours am: b0272195 -s ours

am skip reason: Merged-In If8829cebb0c62b539d7a336b75cf106755588cdd with SHA-1 9192abcf is already in history

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

Change-Id: I506883a7a756bfdfe86da42eef9bd427b104348e