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