Merge "Fix entitlement failed when device is on CBRS"