Merge "Move PointerIconType to AIDL" into main