[automerger skipped] Merge "RESTRICT AUTOMERGE: [MTE] Update manifest IDs to...

[automerger skipped] Merge "RESTRICT AUTOMERGE: [MTE] Update manifest IDs to align with NDK." am: c8eb0a1d -s ours am: 731483f2 -s ours am: c928f44d -s ours am: 906c68bb -s ours am: 82f78178 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I666c0482c85e081d85922ee04430cb3a1118c791