Merge "RESTRICT AUTOMERGE: [MTE] Update manifest IDs to align with NDK."