Merge "Remove HIDL graphics.mapper service from V+" into main