[automerger skipped] Merge "RESTRICT AUTOMERGE: [MTE] Update manifest IDs to align with NDK." am: c8eb0a1df7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia8794ec5e27ee2b67ea5f7114c4bbdbb58e2fdce