Merge "Use PointerIcon type constants in the AIDL" into main