Merge "manifest.xml: fix IMapper incompatible build error" am: 60bfcf4da4

Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/2244773

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