Merge "[mainline] decouple ServiceState.bitmaskHasTech and getBitmaskForTech"