Merge "Add service-entitlement to the Jarjar rule" into tm-mainline-prod