Merge "OverlayManager: use typed collection type in AIDL"